Revert "Do not build qt on some (GLES) archs"

This reverts commit b80e4ab03f75e1e82e32ec4c04785fe6b45b0c34.

diff --git a/debian/control b/debian/control
index d8eb0f81d455beaa6d2fbde6fc16c728c872518c..3de3d7665924f16f0ef0c12be79e9404a5bde8b7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -248,7 +248,7 @@ Description: VTK examples
  This package provides examples for VTK9
 
 Package: libvtk9-qt
-Architecture: amd64 arm64 i386 mips64el ppc64el s390x
+Architecture: any
 Section: libs
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -260,7 +260,7 @@ Description: VTK libraries, Qt files
  that use VTK. Qt files
 
 Package: libvtk9-qt-dev
-Architecture: amd64 arm64 i386 mips64el ppc64el s390x
+Architecture: any
 Section: libdevel
 Depends: libvtk9-dev (= ${binary:Version}),
          libvtk9-qt (= ${binary:Version}),

diff --git a/debian/rules b/debian/rules
index feb9df503e4412c6855169edec7cde4276627d66..28d8f8e4ae631c5318f3cadac837b051159f77f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ extra_flags +=  \
        -DVTK_BUILD_EXAMPLES=OFF \
        -DVTK_BUILD_TESTING=OFF \
        -DVTK_EXTRA_COMPILER_WARNINGS=ON \
+       -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_RenderingTk:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_utf8:STRING="YES" \
        -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \
@@ -55,14 +56,6 @@ extra_flags +=  \
        -DVTK_WRAP_PYTHON=ON \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
-
-noqt_archs="armel armhf"
-ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(noqt_archs)))
-        extra_flags += -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" -DVTK_MODULE_ENABLE_VTK_ViewsQt:STRING="YES" -DVTK_GROUP_ENABLE_Qt:STRING="YES"
-else
-        extra_flags += -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="NO" -DVTK_MODULE_ENABLE_VTK_ViewsQt:STRING="NO" -DVTK_GROUP_ENABLE_Qt:STRING="NO"
-endif
-
 override_dh_auto_configure:
        dh_auto_configure -- $(extra_flags)